Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for the new BICR generation tools #2298

Merged
merged 33 commits into from
Dec 16, 2024

Conversation

gmarull
Copy link
Member

@gmarull gmarull commented Nov 25, 2024

BICR generation happens now using a new tool integrated in upstream Zephyr

@gmarull gmarull modified the milestones: ncs-2.9.0, ncs-2.9.0-nRF54H20 Dec 2, 2024
@jukkar jukkar requested review from de-nordic and a team as code owners December 5, 2024 13:56
@gmarull gmarull force-pushed the upstream-bicr branch 4 times, most recently from 19f12e3 to 5364114 Compare December 12, 2024 09:10
…efault"

This reverts commit e88198c.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit 2964006.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
…symbol for nRF54L05 & L10"

This reverts commit c2ce476.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit a7b06ba.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
gmarull and others added 25 commits December 16, 2024 10:08
This reverts commit 13eda60.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Shell is capable of acting as the logging backend and multiplex
logging messages with shell content. It expects that logging
messages goes through the logging backend. However, there is an
option that logs go only to the custom logging frontend. In
that case this default approach does not work and logging
frontend cannot be easily integrated with the shell (due to
its custom nature). Add Kconfig option SHELL_LOG_BACKEND_OOB
which prevent compilation of the default shell log backend.
When enabled, application can provide frontend specific
implementation to integrate shell with the logging.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 05dd68a)
Extract shell instance creation from SHELL_DEFINE to Z_SHELL_DEFINE.
SHELL_DEFINE creates logging backend and calls Z_SHELL_DEFINE to
create a shell instance with that logging backend. With this split
it is possible to create a shell instance with logging integration
but without the default shell logging backend.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 7474676)
… buffer declaration

Use DMM_MEMORY_SECTION instead of a custom macro. When file was created
dmm was not present yet.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit fe6c288)
Extend ETR handler to be able to work as shell backend and multiplex
Coresight STM logging with shell content on the UART used by the
ETR handler. Shell backend works only in the standalone mode.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 7ea87f4)
…en ETR is used

ETR handler (for Coresight STM logging) is using console UART and
can act as the shell backend. When that happens default serial shell
backend shall be disabled (and it is by default enabled if there is
a zephyr,console chosen set.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 6253c06)
…the logging frontend

When shell is integrated with the logging frontend then pointer to
the logging backend in the shell structure is null. When null pointer
is found assume that it is a shell instance with logging frontend
integration and use frontend in the logging commands.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit 60d8482)
The production version of the nRF54H20 SoC is now available, so remove
the initial Engineering B (EngB) preview version.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit 9643ca2)
…L05 and L10 ICs

The nRF54L05 and nRF54L10 are identical to the nRF54L15 except for their
memory sizes. Add support for emulating those ICs on the nRF54L15DK.
This commit only adds support for the main application core. Support for
the FLPR core may be added later.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit 2147577)
This adds the nrf54l15dk/nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15dk with TF-M in nRF Connect SDK.

This is done as a noup as the out-of-tree board extension feature is
not available. When zephyrproject-rtos/zephyr#69548 is completed this
commit can be reverted and the variant be placed in sdk-nrf.

Signed-off-by: Tomi Fontanilles <[email protected]>
(cherry picked from commit 6b4c840)
These two new ICs are variants of the nRF54L15 with different memory
sizes:

- nRF54L05: 500KB RRAM, 96KB RAM
- nRF54L10: 1022KB RRAM, 192KB RAM
- nRF54L15: 1524KB RRAM, 256KB RAM

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit e788320)
(cherry picked from commit 29e1f33)
Add support for GRTC clock output pins.

Upstream PR #: 82788

Signed-off-by: Adam Kondraciuk <[email protected]>
…or nRF54L05 & L10

MDK 8.68.1 uses nRF54L15_XXAA symbol for determining whether
given errata is applicable or not for nRF54L Series SoCs.
This causes all erratas to be disabled for nRF54L05 and nRF54L10.
To mitigate this DEVELOP_IN_NRF54L15 symbol needs to be defined,
and removed once new MDK is integrated.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit a1152cd)
This is a long-term noup patch because crypto driver support is
NCS-only for both cryptocell and CRACEN.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Set PSA as the entropy source for 54L.

PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Rubin Gerritsen <[email protected]>
(cherry picked from commit d643f17)
The SoftDevice Controller is a different controller than
the open source link layer with a different set of quirks.
It should therefore have its own device tree binding.

This commit converts the SoftDevice Controller driver
to use this new DTS binding instead of reusing the existing one.

This commit updates or adds additional overlays for
existing samples, applications and tests that were using the
open source link layer.

Signed-off-by: Rubin Gerritsen <[email protected]>
(cherry picked from commit 8d6a853)
… APIs

Add zero latency interrupt safe APIs to allow requesting and
releasing HFXO. These will be used from components running
in zero latency interrupt context, like the bluetooth stack.

Co-authored-by: Piotr Pryga <[email protected]>

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
Signed-off-by: Piotr Pryga <[email protected]>
(cherry picked from commit 2aec438)
…sr API

Implement the zero latency interrupt safe APIs to the HFXO clock
commonly used by the bluetooth stach from zero latency interrupt
context.

Co-authored-by: Piotr Pryga <[email protected]>

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
Signed-off-by: Piotr Pryga <[email protected]>
(cherry picked from commit 73a45a7)
Add binding for the Nordic nRF BICR memory.

Upstream PR #: 81122

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 83938e65cba6842c253c1b7741d33d669548bdf4)
BICR (Board Information Configuration Registers) are located within the
application UICR region (ref. MRAM mapping, table 38).

Upstream PR #: 81122

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 08f6abad8ddea830b6ff4ed7ae663f3e97a0b16f)
The real, applicable and trusted values are the ones flashed into BICR.
So, drop DT properties that replicate BICR and use runtime reads to BICR
instead.

Upstream PR #: 81122

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 21901ca3f1a535466a5b4023d66bf492d974d808)
…obtain LFOSC acc

Add a utility function to obtain LFOSC accuracy in PPM from BICR.

Upstream PR #: 81122

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit bb2e6d4f2e83ad80e299418a9883670e0de627ae)
…BICR

The real, applicable and trusted values are the ones flashed into BICR.
So, drop DT properties that replicate BICR and use runtime reads to BICR
instead.

Upstream PR #: 81122

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 1b3500e022d28d78934570b2e3112badf65b6d23)
… BICR

The real, applicable and trusted values are the ones flashed into BICR.
So, drop DT properties that replicate BICR and use runtime reads to BICR
instead.

Upstream PR #: 81122

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit a41e7e407448e731cdb3861864d89b1632b57b3d)
Add supporting scripts and build-system integration for BICR (Board
Information Configuration Registers) generation.

Upstream PR #: 81604

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 2c4bdd33a0b87e6d5f9c58a59fd3ca554e03366b)
bicr.json is a supporting file that, if present and
CONFIG_SOC_NRF54H20_GENERATE_BICR=y (default), will be used to generate
a BICR hex file. The schema for the file can be found at
soc/nordic/nrf54h20/bicr/bicrgen-schema.json.

Upstream PR #: 81604

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 9b6dbda7458bc39a8900b43d12c237062e834f7d)
Copy link
Contributor

@anangl anangl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the three re-applied [nrf noup] commits (25fa3ca, 5cb0130, and 4daa9d2) the SHA references in the "cherry picked from commit" line are not from the most recent cherry-picking, but from the previous one, what is misleading. It would be good to either update or remove them.

@jukkar jukkar merged commit c0f42b2 into nrfconnect:main Dec 16, 2024
16 checks passed
@gmarull gmarull mentioned this pull request Jan 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.